Fix bug where redraw wasn't being done properly when height of dirty

Sat Jul 22 11:16:05 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextview.c (changed_handler): Fix bug where
	redraw wasn't being done properly when height of
	dirty region changed.

	* demos/Makefile.am: Remove various references to
	-lgmodule

	* Makefile.am (test_gdk_pixbuf_LDADD): Remove -lgmodule

diff --git a/ChangeLog b/ChangeLog
index 59fc751fdad827e39c70ee689af9bc22eebaddb7..088f7034d7392f7fc6961d094f2dc23dbb2d6fbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Jul 22 11:16:05 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (changed_handler): Fix bug where
+       redraw wasn't being done properly when height of
+       dirty region changed.
+
+       * demos/Makefile.am: Remove various references to
+       -lgmodule
+
 Fri Jul 21 15:28:13 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtktextlayout.[ch], gtk/gtktextdisplay.c: Use new

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 59fc751fdad827e39c70ee689af9bc22eebaddb7..088f7034d7392f7fc6961d094f2dc23dbb2d6fbe 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Sat Jul 22 11:16:05 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (changed_handler): Fix bug where
+       redraw wasn't being done properly when height of
+       dirty region changed.
+
+       * demos/Makefile.am: Remove various references to
+       -lgmodule
+
 Fri Jul 21 15:28:13 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtktextlayout.[ch], gtk/gtktextdisplay.c: Use new

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 59fc751fdad827e39c70ee689af9bc22eebaddb7..088f7034d7392f7fc6961d094f2dc23dbb2d6fbe 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Sat Jul 22 11:16:05 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (changed_handler): Fix bug where
+       redraw wasn't being done properly when height of
+       dirty region changed.
+
+       * demos/Makefile.am: Remove various references to
+       -lgmodule
+
 Fri Jul 21 15:28:13 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtktextlayout.[ch], gtk/gtktextdisplay.c: Use new

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 59fc751fdad827e39c70ee689af9bc22eebaddb7..088f7034d7392f7fc6961d094f2dc23dbb2d6fbe 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Sat Jul 22 11:16:05 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (changed_handler): Fix bug where
+       redraw wasn't being done properly when height of
+       dirty region changed.
+
+       * demos/Makefile.am: Remove various references to
+       -lgmodule
+
 Fri Jul 21 15:28:13 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtktextlayout.[ch], gtk/gtktextdisplay.c: Use new

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 59fc751fdad827e39c70ee689af9bc22eebaddb7..088f7034d7392f7fc6961d094f2dc23dbb2d6fbe 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Sat Jul 22 11:16:05 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (changed_handler): Fix bug where
+       redraw wasn't being done properly when height of
+       dirty region changed.
+
+       * demos/Makefile.am: Remove various references to
+       -lgmodule
+
 Fri Jul 21 15:28:13 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtktextlayout.[ch], gtk/gtktextdisplay.c: Use new

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 59fc751fdad827e39c70ee689af9bc22eebaddb7..088f7034d7392f7fc6961d094f2dc23dbb2d6fbe 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Sat Jul 22 11:16:05 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (changed_handler): Fix bug where
+       redraw wasn't being done properly when height of
+       dirty region changed.
+
+       * demos/Makefile.am: Remove various references to
+       -lgmodule
+
 Fri Jul 21 15:28:13 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtktextlayout.[ch], gtk/gtktextdisplay.c: Use new

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 59fc751fdad827e39c70ee689af9bc22eebaddb7..088f7034d7392f7fc6961d094f2dc23dbb2d6fbe 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Sat Jul 22 11:16:05 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (changed_handler): Fix bug where
+       redraw wasn't being done properly when height of
+       dirty region changed.
+
+       * demos/Makefile.am: Remove various references to
+       -lgmodule
+
 Fri Jul 21 15:28:13 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtktextlayout.[ch], gtk/gtktextdisplay.c: Use new

diff --git a/demos/Makefile.am b/demos/Makefile.am
index de568fea34bc14f280bd6fc0f1ef447ac39b889a..eefb30f09ef879f2e9df8a8b3bd0d89316050edd 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -43,11 +43,11 @@ testpixbuf_scale_DEPENDENCIES = $(DEPS)
 testanimation_DEPENDENCIES = $(DEPS)
 pixbuf_demo_DEPENDENCIES = $(DEPS)
 
-testpixbuf_LDADD = $(LDADDS) -lgmodule
+testpixbuf_LDADD = $(LDADDS)
 testpixbuf_drawable_LDADD = $(LDADDS)
 testpixbuf_scale_LDADD = $(LDADDS)
-testanimation_LDADD = $(LDADDS) -lgmodule
-pixbuf_demo_LDADD = $(LDADDS) -lgmodule
+testanimation_LDADD = $(LDADDS)
+pixbuf_demo_LDADD = $(LDADDS)
 
 testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
 testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 4bc6ed39c90da6892449a8062db03a2f3935010c..db25c41080e04ea4cbb4c22be59797df84b1f2f6 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 22 10:57:22 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * Makefile.am (test_gdk_pixbuf_LDADD): Remove -lgmodule
+
 Tue Jul 11 11:26:42 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gdk-pixbuf.c: Add <string.h> include.

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 79b04626fdfe945e8e2182b9dc6dc8c4a3e3e2e8..c15c1b0bd7fa3cb64d05e08ccb464234da5f468d 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -136,7 +136,7 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\""
 
 LDADDS = libgdk_pixbuf-1.3.la $(GLIB_LIBS) $(STATIC_LIB_DEPS)
 
-test_gdk_pixbuf_LDADD = $(LDADDS) -lgmodule
+test_gdk_pixbuf_LDADD = $(LDADDS)
 
 GDK_PIXBUF_LIBS = $(GLIB_LIBS)
 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index ccdec0eb2089f5b9c973473dfba7bd500eed0620..7304f7302ac6c8bb8954d800732f17c1dfc00b9e 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1209,11 +1209,15 @@ changed_handler (GtkTextLayout *layout,
   if (GTK_WIDGET_REALIZED (text_view))
     {
       gtk_text_view_get_visible_rect (text_view, &visible_rect);
-      
+
       redraw_rect.x = visible_rect.x;
       redraw_rect.width = visible_rect.width;
       redraw_rect.y = start_y;
-      redraw_rect.height = MAX (old_height, new_height);
+
+      if (old_height == new_height)
+       redraw_rect.height = old_height;
+      else
+       redraw_rect.height = MAX (0, visible_rect.y + visible_rect.height - start_y);
       
       if (gdk_rectangle_intersect (&redraw_rect, &visible_rect, &redraw_rect))
        {